fix slow shutdown times